Marked plug window as destroyed before destroying the window.

Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtksocket.c (gtk_socket_filter_func): Marked
	plug window as destroyed before destroying the
	window.

diff --git a/ChangeLog b/ChangeLog
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 20468eb62d7d6363363056c6e8443223c14f8b6c..911d364748d3e73e663f6069c14237c26a0b996a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec 18 15:19:54 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Marked
+       plug window as destroyed before destroying the 
+       window.
+
 Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index b281bf5b5c269b75529bc72cf0805715f40d315d..1df52ffafa1195d56c9e092370655712bc100fee 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -622,8 +622,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
            toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
            if (toplevel && GTK_IS_WINDOW (toplevel))
              gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel), xdwe->window);
-           gtk_widget_destroy (widget);
            gdk_window_destroy_notify (socket->plug_window);
+           gtk_widget_destroy (widget);
 
            socket->plug_window = NULL;